Bryan's new changes.

Pull requests from me.