changes by chris
merged