Changed to proper methods
Proper methods are now used