Finish the integration! LOL!!!!

Signed-off-by: Hui Zheng <fengyimzy@gmail.com>