Adjusted to fit new ratios