Lap management