reworking XS enabling check