switching to non-greedy regex