fix dating and helper method