Many changes and GPS fix