improvements for storage