Now with better way of detecting numbered/named