Good working copy.
Changes relating to post 4