1:1 commit
8th june
TODO, change failure probs in controller.cpp