zack's final commit