v0.6 - added manual lap