Fix 2.8 and complete up to 3.b