updates based on Ian's feedback.