TBD/note updates