edited several classes