robustness improvements