SJ refactoring