Commited refractor
saving scene state
Merge