add helper method
fix date format