Updated temp storage according to atom guidelines