changes from joint debugging session