Reproducing Robert+ 2018

Few modifications to be as close as possible to said paper.