[in progress] Update 0.10