modified some variables' name