updates from scylla - this stuff works correctly, it looks like.