Change all static variables in change to non-static