got rid of dateformate dependency