Added date logic.