Changes made by John Ana (johnana191@gmail.com).