fixed scene switching, ready for pull