#28 separate XDelay and Delay from data Common