cixx of how feedback was being handled
Merge branch 'master2'