Feature/better logging 1