Started restructuring figures