Slight changes to locations and speed calculations