fold in feedback from Carl