Made some changes based on feedback from JG and KF.