Update design

More thoughts on race detection etc.