Addressed Kayvon's comments in section 1-3