Merge in Bill's updates