Change the way we pass feedback. Fix #28