Close two birds with one stone: #4 and #6