first draft of full set of changes for post 3