Refactoring && Update S7 to E1