-updated regex matcher groups to reflect the new regex structure