new notes before merge
new notes