added 12, updated 3