start working on xe compatibility