Added some additional debugging code