further adjusted storage models