I contributed $500 in RRSP's as a repayment to the home buyers plan repayment. Do I include the $500 in the regular RRSP screen and also in the Home Buyers Plan screen?"