adds better logging again