Removed time hard coding