Fixed problems with SA computation. Now reflects SU2