added ConvertDischarge