Adding logic to conditionally set clientstorage
Adding logic to conditionally set clientstorage