incorporated Zach's comments