Working Consumption and Potential Re-add Fix