Updating for XE18.11