adding in location support