small error in laps mode, fogoth to put some lines back after merge