Work in some changes from Steve.