Updated Surplus stuff