Made changes off Chris/Zach's feedback