removed some hard coded stuff