removed some hard coded values