scott's changes
merged?