removed some hard coding