add Kevin's rewrites