change first fig and some minor modif to others