Added changes for location