Update 1,3,4,5,6,7a,7b

Add annotations
Update