Modified to resolve using only one regex