Update sc simplify branch