fixing feedback issues