Mr. Nooner's changes to code (hacked it to pieces).