Converting lathe program from G50

Controller Fanuc 21Ti

I have some old programs that I would like to convert from G50 to use geometric offests.

I followed Ox's advice in this thread and am using G10 command. The problem I am having is after a tool change. My first tool go to position, cuts, and retracts to position no problem.

After a tool change, its like the new tool isn't picking up the correct geometric offset. Distance to go on the first motion is showing ~30 inches when it should be ~8 inches.

G54 is zero. Work Offsets are zero.

My code

N1 G10 P0 X0 Z0 (Z0 because I set the geometric Z offsets at the program zero)
N2 T0100
N3 G97 S 1500
N4 G0 X1.0 Z0.85 T0101 M8
.
.
.
N15 G28 U0 Z0 T0100
N16 M0
N17 T0200
N18 G97 S 750
N19 GO U 0.365 W 0.85 T0202