-FEATURE: improved robustness