changed reffs after refactoring