Added even more debug code