Restored save scheme and scenes are mostly working