Update code from nukeviet