bug fix
remove useless argument
put user data in storage to prevent unnecessary requests
put user data in storage to prevent unnecessary requests