removed hard coded stuff.