Fix feedback bugs
Modify example to support feedback