Super-overhaul, phase 2 (not yet checked)