Manually merge changes from Scott