feedback2 fixes - 5