updat regex to not be greedy