Notes-to-self added