#153 made updates based on corey's comments