Refine logging more
Refine logging more
Refine logging more