Some stuff change
Merged