Tweaks to Brian's additions