Xiao's second commit