Full rewrite started