Added XMODE, Added DMODE