All of Brenden's changes this time.