4.4 changes by phyma

Theses are my changes for the 4.4 version