working on analysis
Merge branch 'peter'