Added some more logging