performance refactoring for nick changes