[UNTESTED] Multi-number support #4