note/new.feature refactor