* Added some more logging