quivers container changed to std::map and loop modified