Merged Jacky's updates into merged scene