renamed many variables