removed hard coded location