changed to single regex query