Need to read everything again
Adding figures