Removed the hard coding of date