updated code to reflect v23.2 pref changes