Minor changes to optimise GPS