Added the changes and additions from class