Full Update of all code to avoid stuff not working
Merge origin/master