More changes to Sandbox