Added final mod. to class