notes updated, see #308