As per the above, should be switched to `handle remainder`