Removed hard coded location