reorganization
map parsing