Improve the now_serving method to deal with numbers of all sizes