Working on new feedback mechanism