Some fix + new scene
fix + new scene