Changes made by Scott Stiffler (scott.stiffler23@gmail.com).