Added date check