editted classes again