Added lapnumber and lapstart