Rewrite with C complete