changing storage format
refactoring in progress