added dynamic laps