Updated to add user location