small changes to NOStore