Added support for a bunch of new figures
Added support for the semi-final round of figures