fixes for Zach's new code