Merge from Tom. Syncing works in cow2