I changed a lot (36/40)

I changed a lot