Improved feedback managment