added on custom date_handler function