removed rewrite module
MERGING BACK