Fight now uses Q-version of list and map