Fix new user, work on store file