some tinkering with the figures
Merge branch 'origin/master'