improvement round 1
Revert storage
improvement round 2