refactored dates