Some more changes from Tim.