Major optimization rehaul