Added some extra debug in