Added a bit more logging