continue reworking fab to work with xapi