updates for the next step
more updates
Merge branch 'working-copy'