I changed a lot (32/40)

I changed a lot