massive robustness overhaul