2.31 Rewrite