changes to make sp fe integration work