Ensuring EDA code applies to all right vars