changes according to feedback from claude