added Zach's stuff again