moving mods to new handling style