Updating: improving some emit-functions.