Add comments to enable/disable