add things for @olasd to comment on
remove existing emit