Changes to reflect logging and live usage