Update code from nukeviet (12/02)