Fully changed over to non-redundant classes
Fully changed over to non-redundant classes