Comments was added to rewrite code