work from class
changes from lab