Changes made by h hunter (distarded@gmail.com).