Changes made by Tony Thai (tonythaioc@gmail.com).