intermediate commit, core refactor