Finish controller rewrite