Took out time validation