hash map restructuring remains