Changes made by Che So (richard.cheso@gmail.com).