update notes from crossroads
merge notes