clays changes
merged