It's a good one. I think I should simplify it to a function that can be used by both function. But, there is one concern that people might get confused even more with this thing separated though.