fixed figures and rebuilt