Re-arranging XD job example