Improve scene switching