Updated some files. Still WIP
Removed deprecated warning