More adjustments to meet requirements