use correct package, add log messages back in