Reintroduced some logging