Changed storage to be memory