merged updates from Scott