Zibo's commit