another go at fixing crosovver2/2d