* Fixing bug with timeEmitter due to previous changes