added rewrite and quiz