v3.1 - tweaks per Scott's meeting notes