Updated logging and outputting