adding some better time controls