final modifications to logging from my side