Update to XE4

Update to XE4