moved some comments around