more reworking for pa's new system, will start with xt926 and then bring the rest up