Now not using SharedPreferences