Sandbox updates for #11