converted a few more statements to Var parameters