Adding a little more logging