Improve Feedback resolution