Added Figure stuff