Comments rewritten