added 6, updated 4