Description change and stuff
Merged conflicts