It closes #4
Closes #4 and closes #6