added timer and comments