Updated to have clear boxes