Improved Lap compairson logic