Updated 7 and added 8