first commit (extracted from emitter module)