moved comments to bottom