+ Change method CalculateID