new figures and improve structure