Working version of SU2_DEF