Added some extra debugging