Changed figures to have subfigures