Improved sandbox.