split on regex and used more efficient find