Got rid of redundant shout_map.xml, refactored #2 to no number