comments rewritten