added figures too