lots of changes, working copy