Merging Zach's changes