Rebuilt re-write