changed the logging scheme a bit