Addressed most of Ryan and Zoubin's comments