added 7, updated 6