improvements
fx the diagram
Merge branch 'default' into julie