Some adjustments to measurements + background