More changes to Sandbox

Creating a pull request.