Halfway thru rewrite