change to variables, should have been done in testing