updated store and unstore functionality