commit cua khanh. sua 4 file