pulled in erik s changes to storage