second commit by uloong-chlbd.