better naming for #74