fixed IT support and added XM support