Change to non-deprecated method