now with feedback from claire in place