working on Jake's comments for improvements