Books 6 and 7 Fully Revised