more prototyping on figures
reconcile with local changes