minor changes regex