converted some more statements to Var parameters