update notes
updated notes
merged