ADDED calculate class