i - j refactoring started (i will be z, j will be x)