Included DJS comments on rewrite