366 - convert to use emit_marker