Update code from nukeviet (11/02)