Fig for analysis

Redo most figures