Separated the classes
Separated the classes more