Ready for 1.7