Mods to get things back up and running on new hardware...