More tweaks, add fig. 7 as example