CHANGED: Smoother transition when switching events
Merge remote-tracking branch 'origin/master'