Adding GeoLocation check
Added additional objects to closure