Ready to implement into toolkit
Fixed conflicts