better naming, notes