Continue epic rewrite