GPSEngine modified