Merged in some of Saul's mods