many changes, but half way through them