change to memorystore
UPDATE FUNCTIONS