feedback fixes last 2