merging with evans new version
merged