Zach changes merged with some errors