4.0 Rewrite