Ready for 0.7