little changes from CalculatingThread