Adjusted components to match what we talked about