amended with feedback