Updated version of feedback tool