some rearrangement of my mods