sandbox improvments