Firstpatch

I made some changes