Changing to support emiters