adapt to new observable store