removed usage of datetime.now