Added rewrites back