more comments before refactoring