add more calls before refactoring