additional updates based on Jed's feedback.