Some additional changes for SU2 section.