add new stuff + regular expression matching