Added more logging points