Still a bit left to go but good progress