Adding 4-4, 4-5 fixes and 4-6 new impl