Merge Andrew's changes.