Few changes

I finally did it!