fixing function assumption in note model
Merge remote-tracking branch 'origin/local' into local