Brining mods up to date with other work