updated note model
merged