Reordered to keep comments with content