Changed rewrite