added cross-fading from 1D to 2D