When I rebased this part the code had completely changed. I ignored the incoming change to continue the review. Can you rebase?