changing to non-deprecated methods