Lap creating works properly now