Merged in Scott's stuff