Balanced some of the classes
Merge origin/master