these are logically different parts of code, and #2 will be removed in your new PR we will work next sprint.