[MOD] update code from 建樂