removed hard coding