All storage working, protected against bad grade adds