updates to sandbox classes