changes for comments to work