Xu's revisions to allow for AE or ACE model