Getting ready for release 2.4