Updated Z-offsets, new end codes