refactored date
merge