reorganized flow to not call setup between games