updates to Brian's last commit