updating smg3 branch