Added support for 11 more figures