4.4 implementation changes