Resotre updates of cube by @yisibl , should push to thx/base