Lets be nice
Merged changes