Initial patches comit
Added the patches