Added some additional debugging