Added GPS check