now with working storage