initial work for XE4 support