Small changes
Added location-based functionality