Changes made by Burke Holland (burkeholland@gmail.com).