7 of 7 plus some cleanup