Scene Refactoring and SIGINT behaviour addition