switched to variable lenght match, added results