some variable definition changes