Working on updating emitter