Toby - Trying to fix logging.