Update to the modified Controller and Manager