Added location checking
Deleted LocationManager