lots of changes - still a long way to go