merged in Scott's changes