Added changes to the location stuff