working on feedback part