still wrong, but another shot at fixing crossover2/2d