add option to disable crossfade