modified to test the new node class and store class