modified some variable's name