rework for new logging system