updates after feedback 1/2
updates after feedback 2/2