Update to respond to feedback