removed hard coded stuff