first-pass at incorporating Schaad's feedback