Back to 2.5 development