Switch to the non-deprecated function