Updates by Babel21