Were some COMMENT UPDATES required here?