making few more var changes