Add yet more logging