Added additional DEBUG statements