toa thuoc and fix bug