Added 2 methods, deprecated 1