Further changed Commenting