More figures and changes