Fixed use of depracated method
Shitloads of stuff