ghep code voi Thanh + edit some class