Almost finish Fig. 5 & 6 with some formatting