Various mods flattened for diff work