RC1 of rewrite and refactor