Removed hard coding of 5