Added stuffs
Fixed conflicts merged kanads changes in