X/Z mode added to hard modes