change to list storage for index