Updated to use Sprint 22 Preference Storage code