Commenting controller\core #31