changed classes a little