Added 2.4, 2.5, and 2.6