Adding my edited work from class7