new rendering strategy
Merge branch 'analysis'
...