Updated GPS check and set