Ready for 1.2 development