Ger, I think Daniel had to do that as well, I was thinking if the safe Z was machine coords and up near home position it was fine but I think Daniel preferred to have work coords or maybe incremental for safe Z so he had to edit the M6End macro.
Hood