Updated to SP2 code status