further simplified storage