Added testing and reseting of track and moving during the event