added robustness draft