Changed: The class variables to instance variables.