Ready for a 2.0.0.3 with a little extra