+ commented out some logging