Finish? rewrite