removed a regex greedy as a biatch