Merging in Shannan's suggestions