cleaned up, waiting for the shared prefs to be added