Prepared for 1.1.1 development