tweak gps and state match