Adding some more logging