added changes from class