added comments and time