update after Jim's amendment