Made changes based off feedback from Chris/Zach