updating helpers to use regex expressions etc