removed more hard coded stuff