changed session/storage to env