Began making changes for NMAD figures.