added v2 to standalone, which replaces last digit with '1' if no digits found