reshuffled some comments