part 6 and 7 and updated library