did some changes to Figure class