expression matching updated