Updated for XD v1.0.2