feedback logic changes and view changes --KW