add THISANDPRIOR support