improved lagacy storage