Moved crossfade to clientstate object