Moved more control over to scene manager