removed hard coding from join