//modified some vars