Update to CTB's changes

[don't merge yet]