Changes made by Nguyen Thanh Tung (ntung@paradigmsft.com).