Refactor SCC and add week12