Added support for crossfade