Incorporated XE12 changes