Got the recent rewrites working