Added limiting to prevent adding more then max to class