Added extra figures generation