adding back in emitting