Update for new feedback mechanism