Changed start-measuring to start-over-measuring in all units