Transition form all code to EbXL++