reorganization for map test