I agree with the comment above that you must take into account both adjustments. I don't think what you are trying to achieve is impossible. Rather, you must take into, and account for, all the variables.