Toby - Trying alternative approach to fixing logging.