Adding feedback fixes