changing some classes
first fully working version