Change r7 to r8