made changes on feedback