Added a regex version