Added back logging