Added filtering to the  vars.