updates based on @mikewalch comments