working on robustness