Uncommented  some debug code