add concurrent dict, fix s2s such that it actually works