Working better, still a bit to go.