Adjusted logging
Merge