Updated sample to latest XD behavior