Simplified rewrite