Working on measurement setup