Added Figure Generation