add geoFence support (all working fine)