more plugin rewrites