update & fixed dates
refactoring