Changes made by Aaron James San Pedro (ajsanpedro@gmail.com). c/o torzrock