Reworking to use managed boxes