-- 22082013 - little optimization of storage system