Some 2.0.0 goodness