Mostly switched to logging