moved comments around