moved some logging