#3, time command cleaned up and updated