Added commented out debug code