further modifications to logging