Finished isolating logging changes