note dao moving toward #24