Tweaks per Alex, Kelly, and Diane