Fixing a minor bug
Adding a check for time
Check statement