fix 1930; add squads to setup