no empty graphs
Merge branch 'veronica'