Major overhaul for 1.8