Getting ready for 2.5