new version with tikz figures