Removed some hard coded stuff