moved offline storage stuff to different part