Added time keeping