merged in zach's changes