removed hard coding after eliminating errors