additional mods refactored