pulling latest notes
merged frmo master