isolate and add automatic return to storage