better feedback handling