fix up cpeterso's concerns