Working on more figures