Changes to the adding of figures