removed ugly commented out debug code