Added my own, Sebastien's and Borgwardt's code