Changed order, added figures, added material