Moved logic to prefab container
And also saved the scene