Changes made during Sunday afternoon debugging session