Update Fig1
Update Fig2
Remove old version of Fig2