Improved restore + fixed oneprocess bug