Updated to use new (un-deprecated) methods