Starting to incorporate Oren and Zoubin's comments