Hi @wwangrock , thanks for this post. It has been very eye opening for me. I am in a similar situation and would be interested to know if you manually split the amounts between resident and non-resident periods? How did you do it? Thank you in advance for the feedback.