Getting ready for 1.1