Improvements to sandbox example.