updated classes
created new classes for discharge