updated 7-1 with more notes