Adding some debug code