Added Location Aware Ability