Added figures, too