again, cleaning up after zach's mess