reworked gps structure