Added figures in new caption style (better)