Addded location functionality