refactored pickdate