adjustments based on discussion with Jason and Jeni