Implemented better version of the One-Step-Robustness. Now we will still make progress towards the goals whenever possible.