changes to calculate class.