refactored for quiet log statements