A new track, some minor changes